Skip to content

Use proper span for break and continue labels #28170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Sep 4, 2015
Merged

Use proper span for break and continue labels #28170

merged 4 commits into from
Sep 4, 2015

Conversation

nagisa
Copy link
Member

@nagisa nagisa commented Sep 2, 2015

@nagisa nagisa force-pushed the loopctl-label-spans branch 3 times, most recently from 13f6302 to 3c6e421 Compare September 2, 2015 19:44
@alexcrichton
Copy link
Member

@bors: r+ d4921874db5cf5f4e3d2fdd3035926beaa0aa2f8

@nagisa nagisa force-pushed the loopctl-label-spans branch from d492187 to 93a1cbc Compare September 2, 2015 21:05
@nagisa
Copy link
Member Author

nagisa commented Sep 2, 2015

Needs re-r+.

@alexcrichton
Copy link
Member

@bors: r+ 93a1cbc91ad340b9586740add923832362388b9f

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

🔒 Merge conflict

@nagisa nagisa force-pushed the loopctl-label-spans branch from 93a1cbc to 1a69348 Compare September 3, 2015 00:50
@nagisa
Copy link
Member Author

nagisa commented Sep 3, 2015

rebased

@alexcrichton
Copy link
Member

@bors: r+ c493084

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit c493084 with merge 3575f06...

@Manishearth Manishearth mentioned this pull request Sep 3, 2015
Merged
@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⌛ Testing commit c493084 with merge e5c5046...

@bors
Copy link
Collaborator

bors commented Sep 3, 2015

⛄ The build was interrupted to prioritize another pull request.

@Manishearth
Copy link
Member

@bors r-

This fails parse tests

bors added a commit that referenced this pull request Sep 3, 2015
@bors
Auto merge of #28200 - Manishearth:rollup, r=Manishearth
1b908be 
- Successful merges: #28164, #28170, #28184, #28186, #28187, #28188, #28191, #28193, #28194, #28195
- Failed merges:
@nagisa
Copy link
Member Author

nagisa commented Sep 3, 2015

The error:

failures:

---- [parse-fail] parse-fail/removed-syntax-uniq-mut-expr.rs stdout ----

error: unexpected compiler error or warning: '/home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs:14:25: 14:27 error: expected one of `!`, `.`, `::`, `;`, `{`, or an operator, found `42`'
status: exit code: 101
command: i686-unknown-linux-gnu/stage2/bin/rustc /home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs -L i686-unknown-linux-gnu/test/parse-fail/ --target=i686-unknown-linux-gnu -L i686-unknown-linux-gnu/test/parse-fail/removed-syntax-uniq-mut-expr.stage2-i686-unknown-linux-gnu.parse-fail.libaux -C prefer-dynamic -o i686-unknown-linux-gnu/test/parse-fail/removed-syntax-uniq-mut-expr.stage2-i686-unknown-linux-gnu --cfg rtopt -O -L i686-unknown-linux-gnu/rt -Z parse-only
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
/home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs:14:21: 14:24 error: expected identifier, found keyword `mut`
/home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs:14     let a_box = box mut 42;
                                                                                                                                        ^~~
/home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs:14:25: 14:27 error: expected one of `!`, `.`, `::`, `;`, `{`, or an operator, found `42`
/home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/test/parse-fail/removed-syntax-uniq-mut-expr.rs:14     let a_box = box mut 42;
                                                                                                                                            ^~

------------------------------------------

thread '[parse-fail] parse-fail/removed-syntax-uniq-mut-expr.rs' panicked at 'explicit panic', /home/ubuntu/src/rust-buildbot/slave/auto-linux-32-opt/build/src/compiletest/runtest.rs:1501

The test itself seems to expect errors exactly as emitted. I’m baffled. Are 32bit linux builders broken?
I’m getting seriously annoyed.

@Manishearth
Copy link
Member

Could be, not sure. check-stage1 passes fine for me without your PR, so it's either an intermittent, brokenness in the PR, or brokenness introduces in confluence in another PR.

I can't see how this PR could break parsing, though. I'll poke further once I'm sure that the rollup passes check-stage2 locally

@alexcrichton
Copy link
Member

@bors: r+ c493084

Let's see what happens outside the rollup

@Manishearth
Copy link
Member

@bors p=1

@bors
Copy link
Collaborator

bors commented Sep 4, 2015

⌛ Testing commit c493084 with merge 791e7bc...

bors added a commit that referenced this pull request Sep 4, 2015
@bors
Auto merge of #28170 - nagisa:loopctl-label-spans, r=alexcrichton
791e7bc 
r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Sep 4, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit c493084 into rust-lang:master Sep 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nagisa @alexcrichton @bors @Manishearth